Closes issue #1428