Fixed hotfix problem