Tentative fix of huge parsing problem.