diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h
index e4f7be22..97e0b4aa 100644
--- a/core/LocAdapterBase.h
+++ b/core/LocAdapterBase.h
@@ -69,15 +69,11 @@ protected:
     inline LocAdapterBase(const MsgTask* msgTask) :
         mIsMaster(false), mEvtMask(0), mContext(NULL), mLocApi(NULL),
         mLocAdapterProxyBase(NULL), mMsgTask(msgTask) {}
-    LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask,
-        ContextBase* context, bool isMaster,
-        LocAdapterProxyBase *adapterProxyBase = NULL);
 public:
     inline virtual ~LocAdapterBase() { mLocApi->removeAdapter(this); }
-    inline LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask,
-                          ContextBase* context,
-                          LocAdapterProxyBase *adapterProxyBase = NULL) :
-        LocAdapterBase(mask, context, false, adapterProxyBase) {}
+    LocAdapterBase(const LOC_API_ADAPTER_EVENT_MASK_T mask,
+                   ContextBase* context, bool isMaster = false,
+                   LocAdapterProxyBase *adapterProxyBase = NULL);
 
     inline LOC_API_ADAPTER_EVENT_MASK_T
         checkMask(LOC_API_ADAPTER_EVENT_MASK_T mask) const {
diff --git a/core/LocAdapterProxyBase.h b/core/LocAdapterProxyBase.h
index b33d7b0e..727d424f 100644
--- a/core/LocAdapterProxyBase.h
+++ b/core/LocAdapterProxyBase.h
@@ -40,8 +40,8 @@ private:
     LocAdapterBase *mLocAdapterBase;
 protected:
     inline LocAdapterProxyBase(const LOC_API_ADAPTER_EVENT_MASK_T mask,
-                   ContextBase* context):
-                   mLocAdapterBase(new LocAdapterBase(mask, context, this)) {
+                               ContextBase* context, bool isMaster = false):
+            mLocAdapterBase(new LocAdapterBase(mask, context, isMaster, this)) {
     }
     inline virtual ~LocAdapterProxyBase() {
         delete mLocAdapterBase;