fixed order by issue