fix on the if then else condition
Merge branch 'thomas'