fixup! Code adapted to current version