Closes issue #1201