Patch for future parser