#457, #252 , fix for ParserBundle and AWD1Parser