Repair 2 without Unsafe