current_order fix