Resolves issue #969