Fix bug which can modify the hard-coded separators