Closes issue #1394