fix for #1090
Merge pull request #1091 from belforte/master

fix for #1090