Merge pull request #1502 from mbechard/master

fix for #1501