Update to #702