Closes issue #1449