[modify] some issue resolve