Closes issue #1660