1 files changed, 2 insertions, 4 deletions

diff --git a/signal-composer-binding/signal.cpp b/signal-composer-binding/signal.cpp
index ab8723e..e7156dc 100644
--- a/signal-composer-binding/signal.cpp
+++ b/signal-composer-binding/signal.cpp
@@ -144,10 +144,8 @@ struct signalCBT* Signal::get_context()
 {
 	struct signalCBT* ctx =	new struct signalCBT;
 
-	if(!ctx->searchNsetSignalValue)
-		{ctx->searchNsetSignalValue = searchNsetSignalValueHandle;}
-	if(!ctx->setSignalValue)
-		{ctx->setSignalValue = setSignalValueHandle;}
+	ctx->searchNsetSignalValue = searchNsetSignalValueHandle;
+	ctx->setSignalValue = setSignalValueHandle;
 
 	ctx->aSignal = (void*)this;
 	return ctx;