Closes issue #1468