bug hotfix 2