Fixed bug #373 : Double quote usage fix removing too many double quotes