Resolves issue #1115.

Minor alterations.