Closes issue #1293