similar replacements handling fix