Fixed final buffer spill over

Left old replacer as default