Closes issue #1475