some issue fixed

some issue fixed