Closes issue #1702