bugfix - Replace() was truncating the string