correction from Andy and Isabelle