Changed order of replacements