fixing parsing helpers