Fixed traces replacing