Parsing and fix the bug