diff --git a/src/eitd/xmlutil.cpp b/src/eitd/xmlutil.cpp
index 598f33e05..5fbfa70cd 100644
--- a/src/eitd/xmlutil.cpp
+++ b/src/eitd/xmlutil.cpp
@@ -543,9 +543,9 @@ t_channel_id getepgid(std::string epg_name)
 	CBouquetManager::ChannelIterator cit = g_bouquetManager->tvChannelsBegin();
 
 	// FIXME: Maybe there's a nicer solution
-	for (int m = 0; m < 2; m++)
+	for (int m = CZapitClient::MODE_TV; m < CZapitClient::MODE_ALL; m++)
 	{
-		if (m == 1)
+		if (m == CZapitClient::MODE_RADIO)
 			cit = g_bouquetManager->radioChannelsBegin();
 
 	for (; !(cit.EndOfChannels()); cit++)
diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index a43718d3b..5d91dc7f1 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -3247,12 +3247,12 @@ void CControlAPI::xmltvepgCGI(CyhookHandler *hh)
 
 	for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++)
 	{
+		g_bouquetManager->Bouquets[i]->getTvChannels(chanlist);
+
 		// FIXME: Maybe there's a nicer solution
-		for (int m = 0; m < 2; m++)
+		for (int m = CZapitClient::MODE_TV; m < CZapitClient::MODE_ALL; m++)
 		{
-			if (m == 0)
-				g_bouquetManager->Bouquets[i]->getTvChannels(chanlist);
-			else
+			if (m == CZapitClient::MODE_RADIO)
 				g_bouquetManager->Bouquets[i]->getRadioChannels(chanlist);
 
 		if(!chanlist.empty() && !g_bouquetManager->Bouquets[i]->bHidden && g_bouquetManager->Bouquets[i]->bUser)