Hotfix take 2