Fix the bug with parsing