CRAP: try to rewrite index parsing...