fix escape issues