fix taint issue