Closes issue #1620