diff --git a/include/opendht/dht.h b/include/opendht/dht.h
index 0b1228c4..1c313a64 100644
--- a/include/opendht/dht.h
+++ b/include/opendht/dht.h
@@ -231,7 +231,7 @@ public:
      *
      * @return a token to cancel the listener later.
      */
-    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter&&={}, Where&& w = {});
+    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter={}, Where w = {});
     virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) {
         return listen(key, bindGetCb(cb), std::forward<Value::Filter>(f), std::forward<Where>(w));
     }
diff --git a/include/opendht/dht_interface.h b/include/opendht/dht_interface.h
index 0d3a9b2b..46dfeda7 100644
--- a/include/opendht/dht_interface.h
+++ b/include/opendht/dht_interface.h
@@ -163,7 +163,7 @@ public:
      *
      * @return a token to cancel the listener later.
      */
-    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter&&={}, Where&& w = {}) = 0;
+    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter={}, Where w = {}) = 0;
     virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) = 0;
 
     virtual bool cancelListen(const InfoHash&, size_t token) = 0;
diff --git a/include/opendht/dht_proxy_client.h b/include/opendht/dht_proxy_client.h
index 2017df1a..6c300043 100644
--- a/include/opendht/dht_proxy_client.h
+++ b/include/opendht/dht_proxy_client.h
@@ -166,7 +166,7 @@ public:
      *
      * @return a token to cancel the listener later.
      */
-    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter&&={}, Where&&={});
+    virtual size_t listen(const InfoHash&, GetCallback, Value::Filter={}, Where={});
     virtual size_t listen(const InfoHash& key, GetCallbackSimple cb, Value::Filter f={}, Where w = {}) {
         return listen(key, bindGetCb(cb), std::forward<Value::Filter>(f), std::forward<Where>(w));
     }
diff --git a/include/opendht/securedht.h b/include/opendht/securedht.h
index 732e2b97..14c3015c 100644
--- a/include/opendht/securedht.h
+++ b/include/opendht/securedht.h
@@ -100,7 +100,7 @@ public:
         get(key, bindGetCb(cb), bindDoneCb(donecb), std::forward<Value::Filter>(f), std::forward<Where>(w));
     }
 
-    size_t listen(const InfoHash& id, GetCallback cb, Value::Filter&& = {}, Where&& w = {});
+    size_t listen(const InfoHash& id, GetCallback cb, Value::Filter = {}, Where w = {});
 
     /**
      * Will take ownership of the value, sign it using our private key and put it in the DHT.
diff --git a/src/dht.cpp b/src/dht.cpp
index 418538da..d3c150a8 100644
--- a/src/dht.cpp
+++ b/src/dht.cpp
@@ -787,7 +787,7 @@ Dht::listenTo(const InfoHash& id, sa_family_t af, GetCallback cb, Value::Filter
 }
 
 size_t
-Dht::listen(const InfoHash& id, GetCallback cb, Value::Filter&& f, Where&& where)
+Dht::listen(const InfoHash& id, GetCallback cb, Value::Filter f, Where where)
 {
     scheduler.syncTime();
 
diff --git a/src/dht_proxy_client.cpp b/src/dht_proxy_client.cpp
index 117a7f3a..11f72c5c 100644
--- a/src/dht_proxy_client.cpp
+++ b/src/dht_proxy_client.cpp
@@ -417,7 +417,7 @@ DhtProxyClient::getPublicAddress(sa_family_t family)
 }
 
 size_t
-DhtProxyClient::listen(const InfoHash& key, GetCallback cb, Value::Filter&& filter, Where&& where)
+DhtProxyClient::listen(const InfoHash& key, GetCallback cb, Value::Filter filter, Where where)
 {
     restbed::Uri uri(HTTP_PROTO + serverHost_ + "/" + key.toString());
     auto req = std::make_shared<restbed::Request>(uri);
diff --git a/src/securedht.cpp b/src/securedht.cpp
index 338bcb2c..7dd8dc86 100644
--- a/src/securedht.cpp
+++ b/src/securedht.cpp
@@ -277,7 +277,7 @@ SecureDht::get(const InfoHash& id, GetCallback cb, DoneCallback donecb, Value::F
 }
 
 size_t
-SecureDht::listen(const InfoHash& id, GetCallback cb, Value::Filter&& f, Where&& w)
+SecureDht::listen(const InfoHash& id, GetCallback cb, Value::Filter f, Where w)
 {
     return dht_->listen(id, getCallbackFilter(cb, std::forward<Value::Filter>(f)), {}, std::forward<Where>(w));
 }