Update to #868