Closes issue #1662