Closes issue #1433