trying to fix the parsing, which is broken on .Org