Closes issue #1606