Fix taint

Change-Id: Ie59ba4ac4cd2c28fc2c523a47483105a406af028