REALLY fix parsing