fixup! Work around funny CR issue