adapted to changed interface of parser