Closes issue #1380