Issue fus27

Old comment to be removed ?