Index: libcfa/src/concurrency/io.cfa
===================================================================
--- libcfa/src/concurrency/io.cfa	(revision a46f7b610e23a3ac1457aaac7b0a3ef15450fc12)
+++ libcfa/src/concurrency/io.cfa	(revision 1e30df7c247fd856856ad97d81bc81faecf5bcd5)
@@ -551,5 +551,5 @@
 		enqueue(this.pending, (__outstanding_io&)pa);
 
-		wait( pa.sem );
+		wait( pa.waitctx );
 
 		return pa.ctx;
@@ -578,5 +578,5 @@
 				pa.ctx = ctx;
 
-				post( pa.sem );
+				post( pa.waitctx );
 			}
 
@@ -613,5 +613,5 @@
 		}
 
-		wait( ei.sem );
+		wait( ei.waitctx );
 
 		__cfadbg_print_safe(io, "Kernel I/O : %u submitted from arbiter\n", have);
@@ -631,5 +631,5 @@
 					__submit_only(&ctx, ei.idxs, ei.have);
 
-					post( ei.sem );
+					post( ei.waitctx );
 				}
 
Index: libcfa/src/concurrency/io/types.hfa
===================================================================
--- libcfa/src/concurrency/io/types.hfa	(revision a46f7b610e23a3ac1457aaac7b0a3ef15450fc12)
+++ libcfa/src/concurrency/io/types.hfa	(revision 1e30df7c247fd856856ad97d81bc81faecf5bcd5)
@@ -107,5 +107,5 @@
 	struct __outstanding_io {
 		inline Colable;
-		single_sem sem;
+		oneshot waitctx;
 	};
 	static inline __outstanding_io *& Next( __outstanding_io * n ) { return (__outstanding_io *)Next( (Colable *)n ); }