fixed parser