Fix Some Bug