Taint fixing

Change-Id: Ief03addcd43e1e8d2de4f5cd8dec07ccc3e596df