diff --git a/src/net/azib/ipscan/core/ScanningSubject.java b/src/net/azib/ipscan/core/ScanningSubject.java
index e306effe..cba0fb48 100644
--- a/src/net/azib/ipscan/core/ScanningSubject.java
+++ b/src/net/azib/ipscan/core/ScanningSubject.java
@@ -178,11 +178,10 @@ public class ScanningSubject {
 	}
 
 	public boolean isLocal() {
-		return address.isSiteLocalAddress() || address.isLinkLocalAddress();
+		return ifAddr != null;
 	}
 
-	@Override
-	public String toString() {
+	@Override public String toString() {
 		StringBuilder sb = new StringBuilder(address.getHostAddress());
 		if (requestedPorts != null) {
 			sb.append(':');
diff --git a/src/net/azib/ipscan/fetchers/CommentFetcher.java b/src/net/azib/ipscan/fetchers/CommentFetcher.java
index 8e262ded..fb2b36fe 100644
--- a/src/net/azib/ipscan/fetchers/CommentFetcher.java
+++ b/src/net/azib/ipscan/fetchers/CommentFetcher.java
@@ -16,10 +16,8 @@ public class CommentFetcher extends AbstractFetcher {
 	public static final String ID = "fetcher.comment";
 	
 	private CommentsConfig commentsConfig;
-	private MACFetcher macFetcher;
-	
-	public CommentFetcher(MACFetcher macFetcher, CommentsConfig commentsConfig) {
-		this.macFetcher = macFetcher;
+
+	public CommentFetcher(CommentsConfig commentsConfig) {
 		this.commentsConfig = commentsConfig;
 	}
 
@@ -29,10 +27,6 @@ public class CommentFetcher extends AbstractFetcher {
 
 	public Object scan(ScanningSubject subject) {
 		String mac = (String) subject.getParameter(MACFetcher.ID);
-		if (mac == null && subject.isLocal()) {
-			macFetcher.scan(subject);
-			mac = (String) subject.getParameter(MACFetcher.ID);
-		}
 		return commentsConfig.getComment(subject.getAddress(), mac);
 	}
 }
diff --git a/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java b/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
index 3242b69c..0cbe44d3 100644
--- a/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
+++ b/test/net/azib/ipscan/fetchers/FetcherRegistryTest.java
@@ -34,7 +34,7 @@ public class FetcherRegistryTest {
 		ipFetcher = new IPFetcher();
 		pingFetcher = new PingFetcher(null, null);
 		hostnameFetcher = new HostnameFetcher();
-		commentFetcher = new CommentFetcher(null, null);
+		commentFetcher = new CommentFetcher(null);
 		portsFetcher = new PortsFetcher(null);
 		fetcherRegistry = new FetcherRegistry(asList(ipFetcher, pingFetcher, hostnameFetcher, commentFetcher, portsFetcher), preferences, null);
 	}