diff --git a/include/version_queue.php b/include/version_queue.php
index d025314..2c6bf6b 100644
--- a/include/version_queue.php
+++ b/include/version_queue.php
@@ -76,7 +76,18 @@ class version_queue
 
     function delete()
     {
-        return $this->oVersion->delete();
+        $bSuccess = TRUE;
+
+        if(!$this->oVersion->delete())
+            $bSuccess = FALSE;
+
+        if(!$this->oTestDataQueue->delete())
+            $bSuccess = FALSE;
+
+        if($this->oDownloadUrl->iId && !$this->oDownloadUrl->delete())
+            $bSuccess = FALSE;
+
+        return $bSuccess;
     }
 
     function unQueue()