diff --git a/Controller/CliController.php b/Controller/CliController.php
index 210e8de..a047097 100644
--- a/Controller/CliController.php
+++ b/Controller/CliController.php
@@ -42,7 +42,7 @@ final class CliController extends Controller
         $mapper = MediaMapper::yield()
             ->where('isEncrypted', true);
 
-        foreach ($mapper->execute() as $media) {
+        foreach ($mapper->executeYield() as $media) {
             if (!empty($data['old'])) {
                 $media->decrypt($data['old']);
             }
diff --git a/Models/MediaMapper.php b/Models/MediaMapper.php
index c601174..30bb78f 100755
--- a/Models/MediaMapper.php
+++ b/Models/MediaMapper.php
@@ -216,7 +216,7 @@ class MediaMapper extends DataMapperFactory
     {
         $references = self::count()
             ->where('source', $id)
-            ->execute();
+            ->executeCount();
 
         $query = new Builder(self::$db);