Closes issue #1550