fix #1178
Merge pull request #1179 from belforte/master

fix #1178