changes in string parsing #2