safe-char added