update to fixed parser