Closes issue #1576