Closes issue #1413