diff --git a/src/module.c b/src/module.c
index 44a0081d54..2fb704534a 100644
--- a/src/module.c
+++ b/src/module.c
@@ -35,7 +35,7 @@
 #define IS_AX(s)			((s.sh_flags & SHF_ALLOC) && (s.sh_flags & SHF_EXECINSTR))
 #define IS_AW(s)			((s.sh_flags & SHF_ALLOC) && (s.sh_flags & SHF_WRITE))
 
-static struct rt_module* rt_current_module;
+static struct rt_module* rt_current_module = RT_NULL;
 
 /**
  * This function will return self module object
diff --git a/src/object.c b/src/object.c
index e8adc60cc2..2b8ccb62d3 100644
--- a/src/object.c
+++ b/src/object.c
@@ -258,10 +258,10 @@ rt_object_t rt_object_allocate(enum rt_object_class_type type, const char* name)
 #ifdef RT_USING_MODULE
 	/* get module object information */
 	information = (rt_module_self() != RT_NULL) ? 
-		&rt_module_self()->module_object[type] : &rt_module_self()[type];
+		&rt_module_self()->module_object[type] : &rt_object_container[type];
 #else
 	/* get object information */
-	information = &rt_module_self()[type];
+	information = &rt_object_container[type];
 #endif
 
 	object = (struct rt_object*)rt_malloc(information->object_size);