diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index cc6f329..a363916 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -5,6 +5,7 @@
  
 LOCAL_PATH := $(call my-dir)
 
+
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := pEpAdapter
@@ -13,13 +14,15 @@ LOCAL_MODULE    := pEpAdapter
 LOCAL_CPP_FEATURES += exceptions
 LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared
 
+#FIXME: WORKARROUND 
+STUB = $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine/ $(LOCAL_PATH)/../../)
+$(info $(STUB))
 
 LIB_PEP_ADAPTER_INCLUDE_FILES := $(wildcard $(LOCAL_PATH)/../../*.h*)
+
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../pEpEngine/build-android/include \
             $(LIB_PEP_ADAPTER_INCLUDE_FILES:%=%)
 
-#$(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine)
-
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
 
 LOCAL_SRC_FILES += $(LOCAL_PATH)/../../Adapter.cc \
diff --git a/build-android/takeOutHeaderFiles.sh b/build-android/takeOutHeaderFiles.sh
index afe7784..70260f8 100755
--- a/build-android/takeOutHeaderFiles.sh
+++ b/build-android/takeOutHeaderFiles.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
+echo "Install script"
 set -e
-dir="$1"
-echo "$dir/build-android/include/pEp"
-mkdir -p "$dir/build-android/include/pEp"
-cd "."
-echo `pwd`
-cp ../../*.h* "$dir/build-android/include/pEp"
+engine_dir="$1"
+adapter_dir="$2"
+
+mkdir -p "$engine_dir/build-android/include/pEp"
+cp $2/*.h* "$engine_dir/build-android/include/pEp"