FIxed the parsing issues