fixing parsing issues