Resolves issue #1115.