fix some bug on findbugs