Closes issue #1350