Closes issue #1438