Some Bug Fixed