bug hotfix 3