diff --git a/application/models/experiment.php b/application/models/experiment.php
index d2d6adf..b7941d9 100644
--- a/application/models/experiment.php
+++ b/application/models/experiment.php
@@ -80,8 +80,11 @@ class Experiment extends CI_Model {
 	 * @return boolean Returns TRUE if the deletion was successful.
 	 */
 	public function delete($experimentId) {
+		$this->db->delete('jobs', array('experiment_id' => $experimentId));
+		$this->db->delete('experiments_parameters', array('experiment_id' => $experimentId));
 		$this->db->delete('experiments', array('id' => $experimentId));
-		return $this->db->affected_rows() == 1;
+
+		return $this->db->affected_rows() > 1;
 	}
 
 	/**