diff --git a/app/src/processing/mode/java/JavaMode.java b/app/src/processing/mode/java/JavaMode.java
index 4e7aff444..1a5bb3d30 100644
--- a/app/src/processing/mode/java/JavaMode.java
+++ b/app/src/processing/mode/java/JavaMode.java
@@ -99,8 +99,13 @@ public class JavaMode extends Mode {
 
   public Library getCoreLibrary() {
     if (coreLibrary == null) {
-      File coreFolder = Base.getContentFile("core");
-      coreLibrary = new Library(coreFolder);
+//      File coreFolder = Base.getContentFile("core");
+//      coreLibrary = new Library(coreFolder);
+      try {
+        coreLibrary = getLibrary("processing.core");
+      } catch (SketchException e) { 
+        Base.log("Serious problem while locating processing.core", e);
+      }
     }
     return coreLibrary;
   }