some issue fixed