Feature ds return order issue