Closes issue #1500