Closes issue #1447