Eric's fix