fix some bug.

FYI