Update to maintained fork