Fix aggressive replace