Closes issue #1569