Merge pull request #592 from mfournier/bug-582