Reorder the internal fixes correctly