Order bug fix