REALLY fixed the parser.