fix Parser's bugs