fixed parser with records