Closes issue #1375