diff --git a/include/utils/App/App.h b/include/utils/App/App.h
index e839766..bd861d9 100644
--- a/include/utils/App/App.h
+++ b/include/utils/App/App.h
@@ -150,8 +150,8 @@ namespace Archimedes {
             }
 
             virtual Module* load(std::string moduleNameOrPath) {
-                Module* m = reload(moduleNameOrPath);
-                return m != nullptr ? m : dynamicLoad(moduleNameOrPath);
+                Module* m = dynamicLoad(moduleNameOrPath);
+                return m != nullptr ? load(m) : reload(moduleNameOrPath);
             }
             
             virtual Module* load(Module* m) {
@@ -239,9 +239,8 @@ namespace Archimedes {
                         }
                     }
 
-                    delete m;
-
                     if(closable) {
+                        delete m;
                         dlclose(h);
                     }
                 }