Fixed: findbugs