fixed bug with order