fix for #492
Merge pull request #587 from TitanNano/dev

fixes #492