diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp
index 8ff38c9..50413e3 100644
--- a/libarmbox/playback_libeplayer3.cpp
+++ b/libarmbox/playback_libeplayer3.cpp
@@ -522,10 +522,10 @@ bool cPlayback::SetPosition(int position, bool absolute)
 	return true;
 }
 
-void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language)
+void cPlayback::FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language)
 {
 	hal_info("%s\n", __func__);
-	int max_numpida = *numpida;
+	const int max_numpida = 40;//MAX_PLAYBACK_PIDS defined in neutrino movieplayer.h
 	*numpida = 0;
 
 	if (player && player->manager && player->manager->audio)
diff --git a/libarmbox/playback_libeplayer3.h b/libarmbox/playback_libeplayer3.h
index 2e13905..054c528 100644
--- a/libarmbox/playback_libeplayer3.h
+++ b/libarmbox/playback_libeplayer3.h
@@ -56,8 +56,7 @@ class cPlayback
 		bool GetPosition(int &position, int &duration);
 		void GetPts(uint64_t &pts);
 		bool SetPosition(int position, bool absolute = false);
-		void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language);
-		void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language) { FindAllPids((int*) apids, (unsigned int*) ac3flags, (unsigned int*) numpida, language); };
+		void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
 		void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language);
 		void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language) { FindAllSubs((int*) pids, (unsigned int*) supported, (unsigned int*) numpida, language); };
 		bool SelectSubtitles(int pid, std::string charset = "");