Made Fake Parser compatible with upstream version