Robi's fix