diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
index c07a36c33d..81db7e6537 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
@@ -173,12 +173,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
 					invocation.Arguments.Add(argumentExpression);
 				}
 
-				script.InsertWithCursor(context.TranslateString("Extract method"), method, Script.InsertPosition.Before);
 				foreach (var node in statements.Skip (1)) {
 					script.Remove(node);
 				}
 				script.Replace(statements [0], new ExpressionStatement(invocation));
-				script.Link(target, method.NameToken);
+				script.InsertWithCursor(context.TranslateString("Extract method"), method, Script.InsertPosition.Before);
+				//script.Link(target, method.NameToken);
 			});
 		}
 	}
diff --git a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs
index e661ba0125..81ceacb3bb 100644
--- a/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs
+++ b/ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs
@@ -78,11 +78,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 					Variables = { initializer }
 				};
 
-				script.InsertWithCursor(context.TranslateString("Create constant"), decl, Script.InsertPosition.Before);
-
 				var variableUsage = new IdentifierExpression(name);
 				script.Replace(pexpr, variableUsage);
-				script.Link(initializer.NameToken, variableUsage);
+//				script.Link(initializer.NameToken, variableUsage);
+				script.InsertWithCursor(context.TranslateString("Create constant"), decl, Script.InsertPosition.Before);
 			});
 		}
 	}