Fix commit "WAIT-ON-SEMAPHORE could block indefinitely ..." commit (aa0389fa)