Fix for #489
Merge pull request #490 from CoryChaplin/fixes

Fix for #489