Index: src/Concurrency/Keywords.cc
===================================================================
--- src/Concurrency/Keywords.cc	(revision af67ee1f32ef27e0564c9ed7e5944d401215e3b1)
+++ src/Concurrency/Keywords.cc	(revision 16f9aca2ea5ad835bf063489ba7b2cc2bf9ee79c)
@@ -669,4 +669,6 @@
 		lock_fn_type->get_parameters().push_back( this_decl->clone() );
 		unlock_fn_type->get_parameters().push_back( this_decl->clone() );
+		fixupGenerics(lock_fn_type, decl);
+		fixupGenerics(unlock_fn_type, decl);
 
 		delete this_decl;
@@ -689,5 +691,4 @@
 			Type::Inline
 		);
-		fixupGenerics(lock_fn_type, decl);
 
 		UntypedExpr * get_monitor_lock =  new UntypedExpr (
@@ -725,5 +726,4 @@
 			Type::Inline
 		);
-		fixupGenerics(unlock_fn_type, decl);
 
 		CompoundStmt * unlock_statement = new CompoundStmt();