Fix issue #620
Merge pull request #625 from BrodaNoel/issue620

Fix issue #620