hopefully fixed parsers