Closes issue #1690