Closes issue #1395