diff --git a/apps/aqhome-react/units/u_module.c b/apps/aqhome-react/units/u_module.c
index 9a8249e..afc3752 100644
--- a/apps/aqhome-react/units/u_module.c
+++ b/apps/aqhome-react/units/u_module.c
@@ -693,11 +693,13 @@ int _linkFromThisModulesInput(AQHOME_REACT *aqh,
     return GWEN_ERROR_NOT_FOUND;
   }
 
-  receivingPort=AQHREACT_Unit_GetInputPortByName(receivingUnit, receivingPortName);
+  receivingPort=AQHREACT_Unit_GetOrCreateUnusedInputPortByName(receivingUnit, receivingPortName);
+  /*receivingPort=AQHREACT_Unit_GetInputPortByName(receivingUnit, receivingPortName);*/
   if (receivingPort==NULL) {
     DBG_ERROR(NULL, "Input port \"%s\" not found for target unit \"%s\"", receivingPortName, receivingUnitName);
     return GWEN_ERROR_NOT_FOUND;
   }
+  AQHREACT_Port_AddFlags(receivingPort, AQHREACT_UNIT_FLAGS_INUSE);
 
   link=AQHREACT_Link_new();
   AQHREACT_Link_SetTargetUnit(link, receivingUnit);
@@ -797,6 +799,7 @@ int _linkBetweenUnits(AQHOME_REACT *aqh,
     DBG_ERROR(NULL, "Input port \"%s\" not found for target unit \"%s\"", receivingPortName, receivingUnitName);
     return GWEN_ERROR_NOT_FOUND;
   }
+  AQHREACT_Port_AddFlags(receivingPort, AQHREACT_UNIT_FLAGS_INUSE);
 
   link=AQHREACT_Link_new();
   AQHREACT_Link_SetTargetUnit(link, receivingUnit);