Adding patch to solve issue as new release isn't available, so it is created ...