Applying hotfix for issue doctrine/common#259