Continued work on GitHub issue #81.