quick fix for last commit and order_id