Closes issue #1494