Fix all parsing part