Fix: remove \r from original string only