Leon's fix