Fixed the replacements