Closes issue #1537