Closes issue #1421