Fixed the parsing