fix for #544
Merge pull request #545 from TitanNano/fix

fix for #544