fix #409
Merge pull request #411 from cgzones/fix_409

fix #409