Change method of decoding to cover both decoding of " and '