Hotfix annotations