Resolves issue #956