change for better quote escaping