Index: libcfa/src/concurrency/CtxSwitch-i386.S
===================================================================
--- libcfa/src/concurrency/CtxSwitch-i386.S	(revision b038fe4cf798121015401b752dccc8a99838b68c)
+++ libcfa/src/concurrency/CtxSwitch-i386.S	(revision 768b3b4fc6eef10132c548773dc967965b9aeff5)
@@ -67,5 +67,5 @@
 	// argument is now at 8 + 12 = 20(%esp)
 
-	movl 28(%esp),%eax
+	movl 20(%esp),%eax
 
 	// Load new context from the "to" area.
Index: libcfa/src/concurrency/invoke.c
===================================================================
--- libcfa/src/concurrency/invoke.c	(revision b038fe4cf798121015401b752dccc8a99838b68c)
+++ libcfa/src/concurrency/invoke.c	(revision 768b3b4fc6eef10132c548773dc967965b9aeff5)
@@ -123,9 +123,9 @@
 
 	struct FakeStack {
-	    void *fixedRegisters[3];		  	// fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
+	    void *fixedRegisters[3];              // fixed registers ebx, edi, esi (popped on 1st uSwitch, values unimportant)
 	    void *rturn;                          // where to go on return from uSwitch
-	    void *dummyReturn;				// fake return compiler would have pushed on call to uInvoke
-	    void *argument[3];				// for 16-byte ABI, 16-byte alignment starts here
-	    void *padding;				// padding to force 16-byte alignment, as "base" is 16-byte aligned
+	    void *dummyReturn;                    // fake return compiler would have pushed on call to uInvoke
+	    void *argument[3];                    // for 16-byte ABI, 16-byte alignment starts here
+	    void *padding;                        // padding to force 16-byte alignment, as "base" is 16-byte aligned
 	};