fixed replace issue