Fix taint

Change-Id: I4e32c1378a0a7a8da50a32d1f4bed6047795b388