f9cb3fc846
This resolves a few issues that crept in with the last three pull requests.
This resolves a few issues that crept in with the last three pull requests.