diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt
index afb6374c5520..dea9d4b78755 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ElementResolveResult.kt
@@ -10,7 +10,7 @@ open class ElementResolveResult<out T : PsiElement>(private val element: T) : Gr
 
   final override fun getElement(): T = element
 
-  override fun isValidResult(): Boolean = element.isValid && isStaticsOK && isAccessible && isApplicable
+  final override fun isValidResult(): Boolean = element.isValid && isStaticsOK && isAccessible && isApplicable
 
   override fun isStaticsOK(): Boolean = true
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
index 4d8e9eec67bf..60976f6f4290 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
@@ -159,10 +159,6 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
     for (LocalTerminalCustomizer customizer : LocalTerminalCustomizer.EP_NAME.getExtensions()) {
       try {
         command = customizer.customizeCommandAndEnvironment(myProject, command, envs);
-
-        if (directory == null) {
-          directory = customizer.getDefaultFolder(myProject);
-        }
       }
       catch (Exception e) {
         LOG.error("Exception during customization of the terminal session", e);