Version with correct order's search