Fix for issue #328
Merge pull request #331 from TheMightyBuzzard/issue328

Fix for issue #328