Fixed bug
Merge branch 'philippe-branch'