diff --git a/autotest/InFilterStream/InFilterStream.cpp b/autotest/InFilterStream/InFilterStream.cpp
index b8df71d39..edfb14739 100644
--- a/autotest/InFilterStream/InFilterStream.cpp
+++ b/autotest/InFilterStream/InFilterStream.cpp
@@ -3,7 +3,7 @@
 using namespace Upp;
 
 struct StreamCopyFilter { // Simple filter example just prints amount of data processed
-	Callback2<const void *, int> WhenOut;
+	Event<const void *, int> WhenOut;
 	void Put(const void *ptr, int size) {
 		WhenOut(ptr, size);
 	}
diff --git a/autotest/InFilterStream2/InFilterStream2.cpp b/autotest/InFilterStream2/InFilterStream2.cpp
new file mode 100644
index 000000000..ab7b325a4
--- /dev/null
+++ b/autotest/InFilterStream2/InFilterStream2.cpp
@@ -0,0 +1,25 @@
+#include <Core/Core.h>
+
+using namespace Upp;
+
+CONSOLE_APP_MAIN
+{
+	StdLogSetup(LOG_COUT|LOG_FILE);
+
+	FileIn fin(GetDataFile("InFilterStream2.cpp"));
+	Zlib zlib;
+	InFilterStream in(fin, zlib);
+	zlib.GZip().Header().Compress();
+	
+	String out_path = GetHomeDirFile("infiltertest-output.gz");
+	{
+		FileOut out(out_path);
+		CopyStream(out, in);
+	}
+
+	ASSERT(LoadDataFile("InFilterStream2.cpp") == GZDecompress(LoadFile(out_path)));
+
+	FileDelete(out_path);
+
+	LOG("============= OK");
+}
diff --git a/autotest/InFilterStream2/InFilterStream2.upp b/autotest/InFilterStream2/InFilterStream2.upp
new file mode 100644
index 000000000..d7141ea0b
--- /dev/null
+++ b/autotest/InFilterStream2/InFilterStream2.upp
@@ -0,0 +1,9 @@
+uses
+	Core;
+
+file
+	InFilterStream2.cpp;
+
+mainconfig
+	"" = "";
+