modify a bit issue
avoid conflict