Fix when no fields and sort