remove hotfix change