fixing issues with parser