diff --git a/core/module.mk b/core/module.mk
index da360bc..7b9c5fa 100644
--- a/core/module.mk
+++ b/core/module.mk
@@ -68,9 +68,6 @@ include $(BUILD_RULES)
 $(LOCAL_BUILD_MODULE): $(all_objects)
 	$(transform-o-to-static-lib)
 
-# TODO : the .a file does not arrive in the staging element ==> they micht stay in the obj folder
-copy_to_staging := 1
-
 endif
 
 ###############################################################################
diff --git a/core/rules.mk b/core/rules.mk
index fb7a32b..50bc73e 100644
--- a/core/rules.mk
+++ b/core/rules.mk
@@ -99,10 +99,10 @@ all_shared_libraries := \
 		$(call module-get-staging-filename,$(lib)))
 all_static_libraries := \
 	$(foreach lib,$(LOCAL_STATIC_LIBRARIES), \
-		$(call module-get-staging-filename,$(lib)))
+		$(call module-get-build-filename,$(lib)))
 all_whole_static_libraries := \
 	$(foreach lib,$(LOCAL_WHOLE_STATIC_LIBRARIES), \
-		$(call module-get-staging-filename,$(lib)))
+		$(call module-get-build-filename,$(lib)))
 all_external_libraries := \
 	$(foreach lib,$(LOCAL_EXTERNAL_LIBRARIES), \
 		$(TARGET_OUT_BUILD)/$(lib)/$(lib).done)