Closes issue #1678