Object hotfix