Closes issue #1624