fix for #1070 previous fix not strong enough
Merge pull request #1081 from belforte/master

fix for #1070 previous fix not strong enough