Closes issue #1444