Replaced hotfix by a better solution