fixed parser
merged