fix v3

Change-Id: I1202e5758556c819ba235581d9b14eb3987fe944