Fixing parsing issues in latest patch... grumble.