some little fix using findbugs