diff --git a/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java b/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
index a2cc214216..ce47aeb82b 100644
--- a/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
+++ b/src/java/org/apache/poi/ss/formula/udf/AggregatingUDFFinder.java
@@ -44,6 +44,7 @@ public class AggregatingUDFFinder implements UDFFinder {
      * @param name Name of function.
      * @return Function executor. <code>null</code> if not found
      */
+    @Override
     public FreeRefFunction findFunction(String name) {
         FreeRefFunction evaluatorForFunction;
         for (UDFFinder pack : _usedToolPacks) {
diff --git a/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java b/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
index c69f08009b..382820b1ef 100644
--- a/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
+++ b/src/java/org/apache/poi/ss/formula/udf/DefaultUDFFinder.java
@@ -44,6 +44,7 @@ public final class DefaultUDFFinder implements UDFFinder {
         _functionsByName = m;
     }
 
+    @Override
     public FreeRefFunction findFunction(String name) {
         return _functionsByName.get(name.toUpperCase(Locale.ROOT));
     }
diff --git a/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java b/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
index 279df4fb99..27ceaef3c1 100644
--- a/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
+++ b/src/java/org/apache/poi/ss/formula/udf/IndexedUDFFinder.java
@@ -35,6 +35,7 @@ public class IndexedUDFFinder extends AggregatingUDFFinder {
         _funcMap = new HashMap<Integer, String>();
     }
 
+    @Override
     public FreeRefFunction findFunction(String name) {
         FreeRefFunction func = super.findFunction(name);
         if (func != null) {
diff --git a/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java b/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java
index 597ec539b1..d611f94e9a 100644
--- a/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java
+++ b/src/java/org/apache/poi/ss/formula/udf/UDFFinder.java
@@ -26,6 +26,7 @@ import org.apache.poi.ss.formula.functions.FreeRefFunction;
  * @author PUdalau
  */
 public interface UDFFinder {
+    // FIXME: Findbugs error: IC_SUPERCLASS_USES_SUBCLASS_DURING_INITIALIZATION
     public static final UDFFinder DEFAULT = new AggregatingUDFFinder(AnalysisToolPak.instance);
 
     /**