Closes issue #1670