Fix the parser again