Closes issue #1605