Closes issue #1376