fix parser
almost working map :(