Fix: Proper handling of datapath_id