Merge pull request #594 from danvk/fix-517