fixed parsing issues