[improve] some fixing