Closes issue #1073