Closes issue #1436