Closes issue #1596