Hotfix implementation