bug fix
Merge pull request #855 from NickMk/master

bug fix