Just fixed some bug