Controller hotfix