5.4.1 taint fix improvement