fixed the parser problems