Finally squished the last mf. bug