[MODIFY] some fixing