Fix merged booboo