diff --git a/src/Library/src/GPU/gpu.cpp b/src/Library/src/GPU/gpu.cpp
index 0705b142..9862bbb8 100644
--- a/src/Library/src/GPU/gpu.cpp
+++ b/src/Library/src/GPU/gpu.cpp
@@ -62,14 +62,13 @@ namespace JabyEngine {
             }
 
             void render_dma(const uint32_t* data) {
-                //wait_ready_for_CMD();
-                #pragma message("Can we set_adr and block_ctrl, then wait and then start?!")
-                DMA_IO::GPU.wait();
-
                 // DPCR already enabled
+                DMA_IO::GPU.wait();
                 GPU_IO::GP1.write(GPU_IO::Command::DMADirection(GPU_IO::DMADirection::CPU2GPU));
                 DMA_IO::GPU.set_adr(reinterpret_cast<uintptr_t>(data));
                 DMA_IO::GPU.block_ctrl.write(DMA_IO::BCR::SyncMode2::for_gpu_cmd());
+
+                wait_ready_for_CMD();
                 DMA_IO::GPU.channel_ctrl.write(DMA_IO::CHCHR::StartGPULinked());
             }
         }