Clean up MG's fix