Fix: Datapath restore