Bux fix: Order product_id now being set