1 files changed, 6 insertions, 1 deletions
diff --git a/variable.c b/variable.c
index b3d9b3f6e8..3b3189bddc 100644
--- a/variable.c
+++ b/variable.c
@@ -177,9 +177,14 @@ classname(VALUE klass, int *permanent)
 		path = find_class_path(klass, (ID)0);
 	    }
 	    if (NIL_P(path)) {
-		if (!cid || !st_lookup(RCLASS_IV_TBL(klass), (st_data_t)tmp_classpath, &n)) {
+		if (!cid) {
 		    return Qnil;
 		}
+		if (!st_lookup(RCLASS_IV_TBL(klass), (st_data_t)tmp_classpath, &n)) {
+		    path = rb_str_dup(rb_id2str(cid));
+		    OBJ_FREEZE(path);
+		    return path;
+		}
 		*permanent = 0;
 		path = (VALUE)n;
 		return path;