history fix + parser fix