Added better control for special chars