fixed parser a bit