    define('LONG_MAX', is_int(2147483648) ? 9223372036854775807 : 2147483647);
    define('LONG_MIN', -LONG_MAX - 1);
  
-@@ -455,7 +545,9 @@
+@@ -455,7 +543,9 @@
      'lang.IllegalArgumentException',
      'lang.IllegalStateException',
      'lang.FormatException',

     }
   }
   // }}}
@@ -428,7 +519,6 @@
     ? getenv('SKELETON_PATH')
     : dirname(__FILE__).DIRECTORY_SEPARATOR
   ));

+          break;
+        } elseif (is_file($path)) {
+
+          // To to load via bootstrap class loader, if the file cannot provide the class-to-load
+          // skip to the next include_path part
+          if (FALSE === ($bytes= __xp_load_archive_bytes($path, strtr($str, '.', '/').'.class.php'))) {
+            continue;
+          }
+          
+          if (FALSE === eval('?>'.$bytes)) {
+            xp::error('Bootstrap class loading failure at '.$str.' (file= '.$path.')');
+          }
