Fix: current_id