Try to fix findbugs again