Another embarrassing hotfix