Closes issue #1618