fixed the ordering