diff --git a/libeplayer3/input.cpp b/libeplayer3/input.cpp
index 52085a0..8f42bc8 100644
--- a/libeplayer3/input.cpp
+++ b/libeplayer3/input.cpp
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#define ENABLE_LOGGING 1
+#define ENABLE_LOGGING 0
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libeplayer3/manager.cpp b/libeplayer3/manager.cpp
index 9dc1d38..da39024 100644
--- a/libeplayer3/manager.cpp
+++ b/libeplayer3/manager.cpp
@@ -201,7 +201,7 @@ bool Manager::selectProgram(const int id)
 			if (it->second->hidden || it->second->inactive) {
 				it->second->stream->discard = AVDISCARD_ALL;
 			} else {
-				it->second->stream->discard = AVDISCARD_DEFAULT;
+				it->second->stream->discard = AVDISCARD_NONE;
 				player->input.SwitchAudio(it->second);
 			}
 
@@ -209,7 +209,7 @@ bool Manager::selectProgram(const int id)
 			if (it->second->hidden || it->second->inactive) {
 				it->second->stream->discard = AVDISCARD_ALL;
 			} else {
-				it->second->stream->discard = AVDISCARD_DEFAULT;
+				it->second->stream->discard = AVDISCARD_NONE;
 				player->input.SwitchVideo(it->second);
 			}
 
@@ -217,7 +217,7 @@ bool Manager::selectProgram(const int id)
 			if (it->second->hidden || it->second->inactive) {
 				it->second->stream->discard = AVDISCARD_ALL;
 			} else {
-				it->second->stream->discard = AVDISCARD_DEFAULT;
+				it->second->stream->discard = AVDISCARD_NONE;
 				player->input.SwitchSubtitle(it->second);
 			}
 
@@ -225,7 +225,7 @@ bool Manager::selectProgram(const int id)
 			if (it->second->hidden || it->second->inactive) {
 				it->second->stream->discard = AVDISCARD_ALL;
 			} else {
-				it->second->stream->discard = AVDISCARD_DEFAULT;
+				it->second->stream->discard = AVDISCARD_NONE;
 				player->input.SwitchTeletext(it->second);
 			}
 
diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp
index 35b7c1f..84efe2b 100644
--- a/libspark/playback_libeplayer3.cpp
+++ b/libspark/playback_libeplayer3.cpp
@@ -82,7 +82,9 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
 		} else {
 			std::vector<std::string> keys, values;
 			int selected_program = 0;
-			if (!vpid && !apid && GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) {
+			if (vpid || apid) {
+				;
+			} else if (GetPrograms(keys, values) && (keys.size() > 1) && ProgramSelectionCallback) {
 				const char *key = ProgramSelectionCallback(ProgramSelectionCallbackData, keys, values);
 				if (!key) {
 					player->Close();