fixed parsing
fixed parsing