Fixed some bug.