Fix issue #481
Merge pull request #501 from nazriel/issue481

Fix issue #481