Fix some parsing issue