Closes issue #1532