bug fix
Merge branch 'farghal'