diff --git a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
index ddabf2cff..1be519ec4 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroidCertPins.java
@@ -63,7 +63,7 @@ public class FDroidCertPins {
         if (pinList == null) {
             List<String> l = new ArrayList<>();
             l.addAll(Arrays.asList(DEFAULT_PINS));
-            pinList = pinlist;
+            pinList = l;
         }
 
         return pinList.toArray(new String[pinList.size()]);
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 46144c910..55e59a634 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -27,6 +27,7 @@
         <module name="TypeName" />
 
         <module name="AvoidStarImport" />
+        <module name="AvoidStaticImport" />
         <module name="RedundantImport" />
         <module name="UnusedImports" />