Fix taint

Change-Id: I7d9fb5588072f91bf75257af06e141f6b925fbae