Fix for bug #446
Merge pull request #450 from godarklight/bug-446

Fix for bug #446