fix escape issue