Fix issue #753
Merge pull request #899 from jacquerie/issue-753

Fix issue #753