fixed some findbug