fix parsing part.