Corrected parser