Modified one line to support international characters