- fixed some bug