Closes issue #1412