diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
index 573598ff0e07..56ff172eab0d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java
@@ -470,6 +470,11 @@ public class PsiResolveHelperImpl implements PsiResolveHelper {
         PsiType bound = intersectAllExtends(typeParam, arg);
         return new Pair<PsiType, ConstraintType>(bound, ConstraintType.SUPERTYPE);
       }
+      /*
+      if (psiClass == null && arg instanceof PsiClassType) {
+        return Pair.create(arg, ConstraintType.EQUALS);
+      }
+      */
       return null;
     }
     if (paramClass == null) return null;
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NonExistentGenericAfterNew-out.java b/java/java-tests/testData/codeInsight/completion/smartType/NonExistentGenericAfterNew-out.java
new file mode 100644
index 000000000000..695ff5849b00
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/smartType/NonExistentGenericAfterNew-out.java
@@ -0,0 +1,7 @@
+import java.util.HashMap;
+
+class Test {
+    void test() {
+      java.util.Map<String, ClassThatDoesNotExistYet> map = new HashMap<String, ClassThatDoesNotExistYet>(<caret>);
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/smartType/NonExistentGenericAfterNew.java b/java/java-tests/testData/codeInsight/completion/smartType/NonExistentGenericAfterNew.java
new file mode 100644
index 000000000000..7f18a35bee3e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/smartType/NonExistentGenericAfterNew.java
@@ -0,0 +1,5 @@
+class Test {
+    void test() {
+      java.util.Map<String, ClassThatDoesNotExistYet> map = new HashM<caret>
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
index 352b09a4b62c..53a49e027f19 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
@@ -234,6 +234,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
   }
 
   public void testCastInThrow() throws Exception { doTest(); }
+  public void _testNonExistentGenericAfterNew() throws Exception { doTest(); }
 
   public void testParenAfterNewWithinInnerExpr() throws Exception {
     String path = "/afterNew";