diff --git a/src/analysis/process/file/JavaFile.java b/src/analysis/process/file/JavaFile.java
index 8433830..3e115ee 100644
--- a/src/analysis/process/file/JavaFile.java
+++ b/src/analysis/process/file/JavaFile.java
@@ -387,11 +387,11 @@ private boolean isConstructor(String line) {
 
 	private boolean isInstanceVariable(String in) {
 		in = removeEquals(in);
-		return in.matches("(private|public|protected)[^{]*") && !in.contains("abstract") && !in.contains("(");
+		return in.matches("((private|public|protected) )[^{]*") && !in.contains("abstract") && !in.contains("(");
 	}
 	
 	private boolean isFunction(String in) {
-		return in.matches("(private|public|protected).*") && !in.contains(" new ") && in.contains("(") && !in.contains("=");
+		return in.matches("((private|public|protected) ).*") && !in.contains(" new ") && in.contains("(") && !in.contains("=");
 	}
 
 //---  Support Methods   ----------------------------------------------------------------------