Added support for special character.