Fix from Legrand and Franzoni