Closes issue #1512