Fixed slowness during parsing