diff --git a/examples_tests/21.DynamicTextureIndexing/main.cpp b/examples_tests/21.DynamicTextureIndexing/main.cpp
index d99c77ce92..5225768ebb 100644
--- a/examples_tests/21.DynamicTextureIndexing/main.cpp
+++ b/examples_tests/21.DynamicTextureIndexing/main.cpp
@@ -372,6 +372,9 @@ class DynamicTextureIndexingApp : public ApplicationBase
             mdiCallParams[i].maxCount = pmbData.mdiParameterCount;
         }
 
+        //
+        cpu2gpuParams.beginCommandBuffers();
+
         //create pipeline
         IAssetLoader::SAssetLoadParams lp;
         auto vertexShaderBundle = assetManager->getAsset("../mesh.vert", lp);
@@ -417,7 +420,6 @@ class DynamicTextureIndexingApp : public ApplicationBase
             }
 
             auto gpuShaders = cpu2gpu.getGPUObjectsFromAssets(shaders, shaders + 2, cpu2gpuParams);
-            //cpu2gpuParams.waitForCreationToComplete();
             IGPUSpecializedShader* shaders[2] = { gpuShaders->operator[](0).get(), gpuShaders->operator[](1).get() };
 
             gpuPipelineLayout = logicalDevice->createGPUPipelineLayout(range, range + 1, core::smart_refctd_ptr(ds0layout), core::smart_refctd_ptr(ds1layout));
@@ -454,7 +456,6 @@ class DynamicTextureIndexingApp : public ApplicationBase
 
 
                 auto gpuTexture = cpu2gpu.getGPUObjectsFromAssets(&texture, &texture + 1, cpu2gpuParams)->front();
-                cpu2gpuParams.waitForCreationToComplete();
 
                 info[bind].image.imageLayout = asset::EIL_UNDEFINED;
                 info[bind].image.sampler = core::smart_refctd_ptr(sampler);
@@ -487,6 +488,8 @@ class DynamicTextureIndexingApp : public ApplicationBase
             }
         }
 
+        cpu2gpuParams.waitForCreationToComplete();
+
         core::vectorSIMDf cameraPosition(-4, 0, 0);
         matrix4SIMD projectionMatrix = matrix4SIMD::buildProjectionMatrixPerspectiveFovLH(core::radians(60.0f), float(WIN_W) / WIN_H, 0.1, 100000);
         camera = Camera(cameraPosition, core::vectorSIMDf(0, 0, 0), projectionMatrix, 1.f, 1.f);
diff --git a/examples_tests/Readme.md b/examples_tests/Readme.md
index 30920f656e..a48afac411 100644
--- a/examples_tests/Readme.md
+++ b/examples_tests/Readme.md
@@ -52,7 +52,7 @@ N = No support
 | 18.MitsubaLoader                | S            | N                | S            | S            | N               | S            | N                 | N              | BUILD_MITSUBA_LOADER                              |
 | FREE_SLOT                       |              |                  |              |              |                 |              |                   |                |                                                   |
 | 20.Megatexture                  | S            | S                | S            | S            | S               | S            | N                 | S              |                                                   |
-| 21.DynamicTextureIndexing       | S            | N                | S            | S            | N               | S            | N                 | S              |                                                   |
+| 21.DynamicTextureIndexing       | B            | B                | B            | S            | N               | S            | N                 | S              |                                                   |
 | 22.RaytracedAO                  | N            | N                | W            | N            | N               | W            | N                 | N              | BUILD_MITSUBA_LOADER                              |
 | 23.Autoexposure                 | Y            | Y                | Y            | S            | S               | S            | N                 | S              |                                                   |
 | FREE_SLOT                       |              |                  |              |              |                 |              |                   |                |                                                   |