Closes issue #1616