Closes issue #1492