work with newer cirru-parser