diff --git a/src/net/azib/ipscan/fetchers/HostnameFetcher.java b/src/net/azib/ipscan/fetchers/HostnameFetcher.java
index 25ac38e2..195ccb1d 100644
--- a/src/net/azib/ipscan/fetchers/HostnameFetcher.java
+++ b/src/net/azib/ipscan/fetchers/HostnameFetcher.java
@@ -4,7 +4,6 @@
  */
 package net.azib.ipscan.fetchers;
 
-import net.azib.ipscan.config.ScannerConfig;
 import net.azib.ipscan.core.ScanningSubject;
 import net.azib.ipscan.util.MDNSResolver;
 
@@ -42,12 +41,6 @@ public class HostnameFetcher extends AbstractFetcher {
 
 	public static final String ID = "fetcher.hostname";
 
-	private ScannerConfig config;
-
-	public HostnameFetcher(ScannerConfig config) {
-		this.config = config;
-	}
-
 	public String getId() {
 		return ID;
 	}
@@ -67,11 +60,11 @@ public class HostnameFetcher extends AbstractFetcher {
 		}
 	}
 
-	private String resolveWithMulticastDNS(InetAddress ip) {
+	private String resolveWithMulticastDNS(ScanningSubject subject) {
 		try {
 			// TODO: do this only in case of local subnet
-			MDNSResolver resolver = new MDNSResolver(config.pingTimeout);
-			String name = resolver.resolve(ip);
+			MDNSResolver resolver = new MDNSResolver(subject.getAdaptedPortTimeout());
+			String name = resolver.resolve(subject.getAddress());
 			resolver.close();
 			return name;
 		}
@@ -82,7 +75,7 @@ public class HostnameFetcher extends AbstractFetcher {
 
 	public Object scan(ScanningSubject subject) {
 		String name = resolveWithRegularDNS(subject.getAddress());
-		if (name == null) name = resolveWithMulticastDNS(subject.getAddress());
+		if (name == null) name = resolveWithMulticastDNS(subject);
 		// TODO: incorporate NetBIOS name here as well
 		return name;
 	}
diff --git a/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java b/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
index 5f0ec246..18ef9d02 100644
--- a/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
+++ b/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
@@ -36,7 +36,7 @@ public class FetcherRegistryTest {
 		
 		ipFetcher = new IPFetcher();
 		pingFetcher = new PingFetcher(null, null);
-		hostnameFetcher = new HostnameFetcher(null);
+		hostnameFetcher = new HostnameFetcher();
 		commentFetcher = new CommentFetcher(null);
 		portsFetcher = new PortsFetcher(null);
 		fetcherRegistry = new FetcherRegistry(new Fetcher[] {ipFetcher, pingFetcher, hostnameFetcher, commentFetcher, portsFetcher}, preferences, null);
diff --git a/test/net/azib/ipscan/fetchers/HostnameFetcherTest.java b/test/net/azib/ipscan/fetchers/HostnameFetcherTest.java
index 92dfa596..db7673c9 100644
--- a/test/net/azib/ipscan/fetchers/HostnameFetcherTest.java
+++ b/test/net/azib/ipscan/fetchers/HostnameFetcherTest.java
@@ -3,7 +3,6 @@
  */
 package net.azib.ipscan.fetchers;
 
-import net.azib.ipscan.config.ScannerConfig;
 import net.azib.ipscan.core.ScanningSubject;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,7 +12,6 @@ import java.net.UnknownHostException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
 
 /**
  * HostnameFetcherTest
@@ -24,7 +22,7 @@ public class HostnameFetcherTest extends AbstractFetcherTestCase {
 
 	@Before
 	public void setUp() throws Exception {
-		fetcher = new HostnameFetcher(mock(ScannerConfig.class));
+		fetcher = new HostnameFetcher();
 	}
 	
 	@Test