Closes issue #1354