Closes issue #1330