Fixed missing and extra quotes