diff --git a/bindings/java/src/org/sleuthkit/datamodel/TskData.java b/bindings/java/src/org/sleuthkit/datamodel/TskData.java
index cb2672f3680bbb84911adb84e474cbd87df3f0b6..0972d09e4b663a62d851bf77f80da79e978f744b 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TskData.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TskData.java
@@ -249,12 +249,12 @@ public String toString() {
 		public static Set<TSK_FS_META_FLAG_ENUM> valuesOf(short metaFlags) {
 			Set<TSK_FS_META_FLAG_ENUM> matchedFlags = EnumSet.noneOf(TSK_FS_META_FLAG_ENUM.class);
 
+			if (metaFlags == TSK_FS_META_FLAG_ENUM.UNKNOWN.getValue()) {
+				matchedFlags.add(TSK_FS_META_FLAG_ENUM.UNKNOWN);
+				return matchedFlags;
+			}
+			
 			for (TSK_FS_META_FLAG_ENUM v : TSK_FS_META_FLAG_ENUM.values()) {
-				
-				if (v == TSK_FS_META_FLAG_ENUM.UNKNOWN) {
-					continue;
-				}
-				
 				long flag = v.getValue();
 
 				if ((metaFlags & flag) == flag) {
@@ -262,10 +262,6 @@ public static Set<TSK_FS_META_FLAG_ENUM> valuesOf(short metaFlags) {
 				}
 			}
 			
-			if (metaFlags == TSK_FS_META_FLAG_ENUM.UNKNOWN.getValue()) {
-				matchedFlags.add(TSK_FS_META_FLAG_ENUM.UNKNOWN);
-			}
-
 			return matchedFlags;
 		}