Resolves issue #941