Esteban's fix