Closes issue #1482