fixed some bug
fixed marege