Changed logic of Parser.