diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp
index 9a3fb83..1804a2b 100644
--- a/winixd/core/app.cpp
+++ b/winixd/core/app.cpp
@@ -1874,6 +1874,12 @@ void App::SendAnswer()
 		UseEzcGenerator();
 	}
 
+	if( cur.request->container_type == Request::ContainerType::container_raw && cur.request->send_bin_stream )
+	{
+		Send8bitOutput(cur.request->out_bin_stream);
+		return;
+	}
+	else
 	if( cur.request->container_type == Request::ContainerType::container_raw )
 	{
 		PrepareRawAnswer();
@@ -1900,11 +1906,6 @@ void App::SendAnswer()
 
 void App::PrepareRawAnswer()
 {
-	if( cur.request->send_bin_stream )
-	{
-		Send8bitOutput(cur.request->out_bin_stream);
-	}
-	else
 	if( cur.request->send_main_stream )
 	{
 		FilterHtmlIfNeeded(cur.request->out_main_stream.get_buffer(), output_8bit, false);
@@ -1921,6 +1922,7 @@ void App::PrepareRawAnswer()
 	}
 }
 
+
 void App::PrepareJsonAnswer()
 {
 	output_8bit << '{';