Merge pull request #590 from danvk/540-fixup