Closes issue #1136