Fixing bugs (findbugs found)