fixed order issue with parsing