diff --git a/examine_ru.h b/examine_ru.h
index 433d9b6..250c162 100644
--- a/examine_ru.h
+++ b/examine_ru.h
@@ -1,20 +1,22 @@
 Global thing_to_examine;
 
-[ExamineScope thing;
-  if (
-    thing ofclass Object &&
-    ! WordInProperty(thing_to_examine, thing, name)
-    thing_to_examine == (thing.&name) --> 0
-  ) {
-    <Examine thing_to_examine>;
-    rtrue;
-  }
+[ UnknownVerb o n i;
+  objectloop (o provides name) {
+    if (TestScope(o, player)) {
+      n = o.#name / WORDSIZE;
+      for(i = 0 : i < n : i++) {
+        if (Refers(o, 1)) {
+          thing_to_examine = o;
+          return 'unknown';
+        };
+      };
+    };
+  };
   rfalse;
 ];
 
-[ UnknownVerb word;
-  thing_to_examine = word;
-  LoopOverScope(ExamineScope);
-  rfalse;
+[ ExamineObjectSub;
+<< Examine (thing_to_examine) >>;
 ];
 
+verb 'unknown' * -> ExamineObject;
diff --git a/source.inf b/source.inf
index 1f36ea9..643c45a 100644
--- a/source.inf
+++ b/source.inf
@@ -19,7 +19,7 @@ Object  gallery "Выставочный зал"
   has   light;
 
 Object  photo "маленьк/ое фото/" gallery
-  with  name 'маленьк/ое' 'фото/' 'фотограф/ия',
+  with  name 'фото' 'фотограф/ия',
 
   describe [;
     "Перед вами стоит маленькое фото.";
@@ -32,7 +32,7 @@ Object  photo "маленьк/ое фото/" gallery
   has static neuter;
 
 Object  teapot "глинян/ый чайник/" gallery
-  with  name 'глинян/ый' 'чай' 'чайник/',
+  with  name 'чай' 'чайник/',
 
   describe [;
     "Слева от фото выставлен невысокий глиняный чайник.";