Closes issue #1562