bug fix in order