Implementing hotfix