fixed parsing