+ fix parser classes