diff --git a/Source/Threading/AuWakeOnAddress.cpp b/Source/Threading/AuWakeOnAddress.cpp
index 52c91720..304bd838 100644
--- a/Source/Threading/AuWakeOnAddress.cpp
+++ b/Source/Threading/AuWakeOnAddress.cpp
@@ -251,7 +251,7 @@ namespace Aurora::Threading
         if (qwNanosecondsAbs)
         {
         #if defined(WOA_SEMAPHORE_MODE)
-            return this->semaphore->LockAbsNS(uEndTime);
+            return this->semaphore->LockAbsNS(qwNanosecondsAbs);
         #else
             auto uNow = AuTime::SteadyClockNS();
 
@@ -1066,7 +1066,7 @@ namespace Aurora::Threading
         AuAtomicClearU8Lock(&this->uAtomic);
     }
     
-    #define AddressToIndexOp(pAddress) AuHashCode(pAddress) & (kDefaultWaitPerProcess - 1)
+    #define AddressToIndexOp(pAddress) (AuHashCode(pAddress) & (kDefaultWaitPerProcess - 1))
     #define AddressToIndex             AddressToIndexOp(pAddress)
 
     WaitEntry *ProcessWaitContainer::WaitBufferFrom(const void *pAddress, AuUInt8 uSize, bool bScheduleFirst, const void *pCompareAddress, EWaitMethod eWaitMethod)