Fixing issue #463
Merge pull request #506 from WoLpH/issue-463-patch

Fixing issue #463