diff --git a/package.json b/package.json
index 7a5dc50..790b45d 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tankz",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "private": true,
   "devDependencies": {
     "ansi-colors": "^1.0.1",
diff --git a/src/common/haxe/ru/m/tankz/engine/Engine.hx b/src/common/haxe/ru/m/tankz/engine/Engine.hx
index daa1ad7..70ba2a7 100755
--- a/src/common/haxe/ru/m/tankz/engine/Engine.hx
+++ b/src/common/haxe/ru/m/tankz/engine/Engine.hx
@@ -65,7 +65,8 @@ class CollisionProcessor implements EngineListener {
     public function onDestroy(entity:EntityType):Void { }
 }
 
-@:yield
+@:build(yield.parser.Parser.run())
+//@:yield  //ToDo: not working
 class Engine implements ControlHandler {
 
     public var config(default, default):Config;
@@ -223,8 +224,9 @@ class Engine implements ControlHandler {
 
     public function iterTanks(filter:Tank->Bool):Iterator<Tank> {
         for (entity in entities) {
-            if (Std.is(entity, Tank) && filter(entity)) {
-                @yield return entity;
+            var tank:Tank = EntityTypeResolver.as(entity, Tank);
+            if (tank != null && filter(tank)) {
+                @yield return tank;
             }
         }
     }