fix parser problems