fixed parser again