Fix generic parser.