Closes issue #1505