Victor's fix