Closes issue #1450