Fixed parser loop