Closes issue #900