Some Bug fixed