Closes issue #1427