Closes issue #1212.