parse bugs fixed