diff --git a/src/main/java/plugins/adufour/blocks/lang/BlockDescriptor.java b/src/main/java/plugins/adufour/blocks/lang/BlockDescriptor.java
index 334411b3d5b1bef8d2b4e96062f80a8b7eadb1fc..62142c8b00ceca0fed0a678abac3a2c3bd9cd777 100644
--- a/src/main/java/plugins/adufour/blocks/lang/BlockDescriptor.java
+++ b/src/main/java/plugins/adufour/blocks/lang/BlockDescriptor.java
@@ -926,8 +926,11 @@ public class BlockDescriptor implements Runnable, VarListener, VarListListener,
     @SuppressWarnings("unchecked")
     public BlockDescriptor clone(boolean embedding, Map<BlockDescriptor, BlockDescriptor> copies)
     {
-        Class<? extends Block> blockClass = PluginLoader.getPlugin(getBlock().getClass().getName()).getPluginClass()
-                .asSubclass(Block.class);
+        // TODO: Why we were using the PluginLoader to retrieve the plugin class ?? (Stephane)
+        // could give issue when for some reasons a Block class isn't present in the PluginLoader plugin list
+//        Class<? extends Block> blockClass = PluginLoader.getPlugin(getBlock().getClass().getName()).getPluginClass()
+//                .asSubclass(Block.class);
+        Class<? extends Block> blockClass = getBlock().getClass().asSubclass(Block.class);
         WorkFlow wf = null;
         WorkFlow wfCpy = null;
         BlockDescriptor cpy = null;