Fix handling for double quote