Closes issue #957