diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp
index 4211a2563..1b6cf840a 100644
--- a/src/zapit/src/zapit.cpp
+++ b/src/zapit/src/zapit.cpp
@@ -762,7 +762,7 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
 		pipVideoDecoder[0]->SetDemux(pipVideoDemux[0]);
 	}
 	if (CFEManager::getInstance()->getFrontendCount() > 1)
-		cDemux::SetSource(dnum, pip_fe->getNumber());
+		cDemux::SetSource(dnum, pip_fe[pip]->getNumber());
 #else
 #ifdef DYNAMIC_DEMUX
 	int dnum = CFEManager::getInstance()->getDemux(newchannel->getTransponderId(), pip_fe[pip]->getNumber());
@@ -2603,6 +2603,9 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 	audioDecoder->SetVideo(videoDecoder);
 
 #ifdef ENABLE_PIP
+#if HAVE_CST_HARDWARE
+	int dnum = 1; // FIXME?
+#endif
 	if (g_info.hw_caps->can_pip)
 	{
 		pipVideoDemux[0] = new cDemux(dnum);
@@ -2626,8 +2629,6 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
 	if (g_info.hw_caps->can_pip)
 	{
 #if HAVE_CST_HARDWARE
-		pipVideoDemux[0] = new cDemux(dnum);
-		pipVideoDemux[0]->Open(DMX_PIP_CHANNEL);
 		pipVideoDecoder[0] = new cVideo(video_mode, pipVideoDemux[0]->getChannel(), pipVideoDemux[0]->getBuffer(), 1);
 #else
 		for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)