fix parsing issues