Closes issue #1667