Derek's fix