Merge pull request #3255 from ace20022/fix_replace