Closes issue #1499