Closes issue #1457