Solved parsing issue