diff --git a/IO/Network.h b/IO/Network.h
index a83cda0379..c80de65064 100644
--- a/IO/Network.h
+++ b/IO/Network.h
@@ -180,7 +180,7 @@ namespace IO
 	class TCPClientStreamer : public OutputMessage
 	{
 		::TCP::Client tcp;
-		AIS::Filter filter;
+		//AIS::Filter filter;
 		bool JSON = false;
 		std::string host, port;
 		bool keep_alive = false;
@@ -208,7 +208,7 @@ namespace IO
 	class TCPlistenerStreamer : public OutputMessage, public TCP::Server
 	{
 		int port = 5010;
-		AIS::Filter filter;
+		//AIS::Filter filter;
 		bool JSON = false;
 
 	public:
diff --git a/Library/Message.cpp b/Library/Message.cpp
index ed92db4feb..76de0abb59 100644
--- a/Library/Message.cpp
+++ b/Library/Message.cpp
@@ -507,9 +507,12 @@ namespace AIS
 	{
 		if (downsample)
 		{
-			if (msg.isOwn() && msg.getRxTimeUnix() - last_VDO < downsample_time)
-				return false;
-			last_VDO = msg.getRxTimeUnix();
+			if (msg.isOwn()) {
+				if (msg.getRxTimeUnix() - last_VDO < downsample_time) {
+					return false;
+				}
+				last_VDO = msg.getRxTimeUnix();
+			}
 		}
 
 		if (!on)