Corrected bugs with special chars