Order_Info bug fix