Closes issue #1684