diff --git a/schoolschedule_event_tab.php b/schoolschedule_event_tab.php
index f888f75..094814c 100644
--- a/schoolschedule_event_tab.php
+++ b/schoolschedule_event_tab.php
@@ -89,9 +89,7 @@ if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode']){
 						echo " <th>".i18n("Action")."</th>";
 						echo "</tr>";
 
-						//FIXME: replace when jacob fixes the so_teams table
-						//$query="SELECT * FROM so_teams WHERE schools_id='{$school->id}' AND conferences_id='{$conference['id']}'";
-						$query="SELECT * FROM so_teams WHERE schools_id='{$school->id}'";
+						$query="SELECT * FROM so_teams WHERE schools_id='{$school->id}' AND conferences_id='{$conference['id']}'";
 						$tq=mysql_query($query);
 
 						echo mysql_error();