1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/lombok/eclipse/HandlerLibrary.java b/src/core/lombok/eclipse/HandlerLibrary.java
index 1eb3c13a..ad9c87b9 100644
--- a/src/core/lombok/eclipse/HandlerLibrary.java
+++ b/src/core/lombok/eclipse/HandlerLibrary.java
@@ -35,10 +35,10 @@ import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.WeakHashMap;
 
-import lombok.ConfigurationKeys;
 import lombok.Lombok;
 import lombok.core.AnnotationValues;
 import lombok.core.AnnotationValues.AnnotationValueDecodeFail;
+import lombok.core.configuration.ConfigurationKeysLoader;
 import lombok.core.HandlerPriority;
 import lombok.core.SpiLoadUtil;
 import lombok.core.TypeLibrary;
@@ -55,15 +55,13 @@ import org.eclipse.jdt.internal.compiler.ast.TypeReference;
  * building an AnnotationValues instance.
  */
 public class HandlerLibrary {
-	static {
-		ConfigurationKeys.ensureKeysLoaded();
-	}
-	
 	/**
 	 * Creates a new HandlerLibrary. Errors will be reported to the Eclipse Error log.
 	 * You probably want to use {@link #load()} instead.
 	 */
-	public HandlerLibrary() {}
+	public HandlerLibrary() {
+		ConfigurationKeysLoader.LoaderLoader.loadAllConfigurationKeys();
+	}
 	
 	private TypeLibrary typeLibrary = new TypeLibrary();