old modif
Fix errors induced from last commit