fix for #1137
Merge pull request #1138 from belforte/master

fix for #1137