Closes issue #1672