Fix for bug #422
Merge pull request #451 from godarklight/bug-422

Fix for bug #422