another parser preparation code + a small preventive fix