Closes issue #1709