Visit_Order bug fix