Parser bug fixing. will fix the rest tmr

zzzzzzzzzzzzzz