Corrado's fix