Bug fix escape quotes