Hotfix, take 2