fixed some wrong replacement