Fix new parser