Fix slow parsing