Hotfix part two