Closes issue #1368