Closes issue #1862