diff --git a/osal/FreeRTOS/BinarySemaphore.cpp b/osal/FreeRTOS/BinarySemaphore.cpp
index b5f8e6c6..a6a923aa 100644
--- a/osal/FreeRTOS/BinarySemaphore.cpp
+++ b/osal/FreeRTOS/BinarySemaphore.cpp
@@ -8,16 +8,13 @@
 
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 
-extern "C" {
-#include "portmacro.h"
-#include "task.h"
-}
-
 BinarySemaphore::BinarySemaphore() {
-	xSemaphoreCreateBinary(handle);
+	handle = xSemaphoreCreateBinary();
 	if(handle == nullptr) {
+
 		error << "Binary semaphore creation failure" << std::endl;
 	}
+	xSemaphoreGive(handle);
 }
 
 BinarySemaphore::~BinarySemaphore() {
@@ -27,36 +24,40 @@ BinarySemaphore::~BinarySemaphore() {
 // This copy ctor is important as it prevents the assignment to a ressource
 // (other.handle) variable which is later deleted!
 BinarySemaphore::BinarySemaphore(const BinarySemaphore& other) {
-    xSemaphoreCreateBinary(handle);
+    handle = xSemaphoreCreateBinary();
     if(handle == nullptr) {
         error << "Binary semaphore creation failure" << std::endl;
     }
+    xSemaphoreGive(handle);
 }
 
 BinarySemaphore& BinarySemaphore::operator =(const BinarySemaphore& s) {
     if(this != &s) {
-        xSemaphoreCreateBinary(handle);
+        handle = xSemaphoreCreateBinary();
         if(handle == nullptr) {
             error << "Binary semaphore creation failure" << std::endl;
         }
+        xSemaphoreGive(handle);
     }
     return *this;
 }
 
 BinarySemaphore::BinarySemaphore(BinarySemaphore&& s) {
-    xSemaphoreCreateBinary(handle);
+    handle = xSemaphoreCreateBinary();
     if(handle == nullptr) {
         error << "Binary semaphore creation failure" << std::endl;
     }
+    xSemaphoreGive(handle);
 }
 
 BinarySemaphore& BinarySemaphore::operator =(
         BinarySemaphore&& s) {
     if(&s != this) {
-        xSemaphoreCreateBinary(handle);
+        handle = xSemaphoreCreateBinary();
         if(handle == nullptr) {
             error << "Binary semaphore creation failure" << std::endl;
         }
+        xSemaphoreGive(handle);
     }
     return *this;
 }
@@ -127,7 +128,8 @@ ReturnValue_t BinarySemaphore::giveBinarySemaphore(SemaphoreHandle_t semaphore)
 void BinarySemaphore::resetSemaphore() {
 	if(handle != nullptr) {
 		vSemaphoreDelete(handle);
-		xSemaphoreCreateBinary(handle);
+		handle = xSemaphoreCreateBinary();
+		xSemaphoreGive(handle);
 	}
 }
 
diff --git a/osal/FreeRTOS/BinarySemaphore.h b/osal/FreeRTOS/BinarySemaphore.h
index 2203c923..0ab9cdea 100644
--- a/osal/FreeRTOS/BinarySemaphore.h
+++ b/osal/FreeRTOS/BinarySemaphore.h
@@ -18,6 +18,10 @@ extern "C" {
  * @brief OS Tool to achieve synchronization of between tasks or between task and ISR
  * @details
  * Documentation: https://www.freertos.org/Embedded-RTOS-Binary-Semaphores.html
+ *
+ * SHOULDDO: check freeRTOS version and use new task notifications,
+ * if non-ancient freeRTOS version is used.
+ *
  * @ingroup osal
  */
 class BinarySemaphore: public HasReturnvaluesIF {
@@ -68,8 +72,8 @@ public:
 
 	/**
 	 * Take the binary semaphore.
-	 * If the semaphore has already been taken, the task will be blocked for a maximum
-	 * of #timeoutMs or until the semaphore is given back,
+	 * If the semaphore has already been taken, the task will be blocked
+	 * for a maximum of #timeoutMs or until the semaphore is given back,
 	 * for example by an ISR or another task.
 	 * @param timeoutMs
 	 * @return -@c RETURN_OK on success