Make sure MV fields don't screw things up