Closes issue #1626