diff --git a/org.ntlab.refactoring.decouplingClasses/src/org/ntlab/refactoring/decouplingClasses/DecoupleClassesRefactoringHandler.java b/org.ntlab.refactoring.decouplingClasses/src/org/ntlab/refactoring/decouplingClasses/DecoupleClassesRefactoringHandler.java
index 8552941..be75e2e 100644
--- a/org.ntlab.refactoring.decouplingClasses/src/org/ntlab/refactoring/decouplingClasses/DecoupleClassesRefactoringHandler.java
+++ b/org.ntlab.refactoring.decouplingClasses/src/org/ntlab/refactoring/decouplingClasses/DecoupleClassesRefactoringHandler.java
@@ -113,8 +113,8 @@
 						null /* use primary owner */,
 						null /* no progress monitor */);
 			}
-//			ITextSelection selection = (ITextSelection) HandlerUtil.getCurrentSelection(event);
-			ITextSelection selection = (ITextSelection) HandlerUtil.getActiveMenuSelection(event);
+			ITextSelection selection = (ITextSelection) HandlerUtil.getCurrentSelection(event);
+//			ITextSelection selection = (ITextSelection) HandlerUtil.getActiveMenuSelection(event);
 			IJavaElement[] elements = ((ICodeAssist)typeRoot).codeSelect(selection.getOffset() + selection.getLength(), 0);
 			if (elements.length > 0) {
 				return elements[0];