diff --git a/src/main/java/com/imyeyu/java/TimiJava.java b/src/main/java/com/imyeyu/java/TimiJava.java
index 5595975..1f8fafc 100644
--- a/src/main/java/com/imyeyu/java/TimiJava.java
+++ b/src/main/java/com/imyeyu/java/TimiJava.java
@@ -5,7 +5,6 @@ import java.io.StringWriter;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import java.util.Objects;
 
 /**
  *
@@ -71,14 +70,11 @@ public interface TimiJava {
 	}
 
 	static <T> T defaultIfNull(T obj, T defaultObj) {
-		return Objects.requireNonNullElse(obj, defaultObj);
+		return firstNotNull(obj, defaultObj);
 	}
 
 	static <T> T defaultIfEmpty(T obj, T defaultObj) {
-		if (isEmpty(obj)) {
-			return defaultObj;
-		}
-		return obj;
+		return firstNotEmpty(obj, defaultObj);
 	}
 
 	@SafeVarargs