--- a/src/jdk.jshell/share/classes/jdk/jshell/Eval.java	Thu Dec 07 10:18:22 2017 -0800
+++ b/src/jdk.jshell/share/classes/jdk/jshell/Eval.java	Thu Dec 07 19:24:27 2017 +0100
@@ -834,6 +834,8 @@
                         if (!toReplace.isEmpty()) {
                             replaced.addAll(toReplace);
                             replaced.stream().forEach(Unit::markForReplacement);
+                            //ensure correct classnames are set in the snippets:
+                            replaced.stream().forEach(u -> u.setWrap(ins, legit));
                         }
 
                         return toReplace.isEmpty() ? Result.SUCESS : Result.FAILURE;