Parsing Bugs correction