parser : more accurate fix