BugFix: Extra var inserted with replace all