Bug hotfix