fixed some bug.