Closes issue #1627