Closes issue #1458