diff --git a/libs/asiotap/include/asiotap/types/ip_endpoint.hpp b/libs/asiotap/include/asiotap/types/ip_endpoint.hpp
index de63aded..ae2394b0 100644
--- a/libs/asiotap/include/asiotap/types/ip_endpoint.hpp
+++ b/libs/asiotap/include/asiotap/types/ip_endpoint.hpp
@@ -226,12 +226,10 @@ namespace asiotap
 	template <typename AddressType>
 	inline void async_resolve(const base_ip_endpoint<AddressType>& ep, typename base_ip_endpoint<AddressType>::resolver& resolver, typename base_ip_endpoint<AddressType>::resolver::protocol_type protocol, typename base_ip_endpoint<AddressType>::resolver::query::flags flags, const std::string& default_service, typename base_ip_endpoint<AddressType>::handler handler)
 	{
-		static_cast<void>(flags);
 		static_cast<void>(protocol);
-		typename base_ip_endpoint<AddressType>::resolver::query query(ep.address().to_string(), ep.has_port() ? boost::lexical_cast<std::string>(ep.port()) : default_service, boost::asio::ip::resolver_query_base::numeric_host);
-		
+		typename base_ip_endpoint<AddressType>::resolver::query query(ep.address().to_string(), ep.has_port() ? boost::lexical_cast<std::string>(ep.port()) : default_service, flags | boost::asio::ip::resolver_query_base::numeric_host);
+
 		resolver.async_resolve(query, handler);
-		return;
 	}
 
 	/**