Resolve replace issue