Closes issue #1561