Fix issue with order