Fix parsing issue