diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java
index 5b73b2ee..8c2f5e62 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/DoubleArgument.java
@@ -123,8 +123,8 @@ public final class DoubleArgument<C> extends CommandArgument<C, Double> {
 
     public static final class Builder<C> extends CommandArgument.Builder<C, Double> {
 
-        private double min = Double.MIN_VALUE;
-        private double max = Double.MAX_VALUE;
+        private double min = Double.NEGATIVE_INFINITY;
+        private double max = Double.POSITIVE_INFINITY;
 
         protected Builder(final @NonNull String name) {
             super(Double.class, name);
diff --git a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java
index 1d039b2f..cc01ee82 100644
--- a/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java
+++ b/cloud-core/src/main/java/cloud/commandframework/arguments/standard/FloatArgument.java
@@ -123,8 +123,8 @@ public final class FloatArgument<C> extends CommandArgument<C, Float> {
 
     public static final class Builder<C> extends CommandArgument.Builder<C, Float> {
 
-        private float min = Float.MIN_VALUE;
-        private float max = Float.MAX_VALUE;
+        private float min = Float.NEGATIVE_INFINITY;
+        private float max = Float.POSITIVE_INFINITY;
 
         protected Builder(final @NonNull String name) {
             super(Float.class, name);
diff --git a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java
index 8e60910c..c3dc2f58 100644
--- a/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java
+++ b/cloud-core/src/test/java/cloud/commandframework/CommandTreeTest.java
@@ -26,6 +26,7 @@ package cloud.commandframework;
 import cloud.commandframework.arguments.CommandArgument;
 import cloud.commandframework.arguments.compound.ArgumentPair;
 import cloud.commandframework.arguments.standard.EnumArgument;
+import cloud.commandframework.arguments.standard.FloatArgument;
 import cloud.commandframework.arguments.standard.IntegerArgument;
 import cloud.commandframework.arguments.standard.StringArgument;
 import cloud.commandframework.context.CommandContext;
@@ -126,6 +127,13 @@ class CommandTreeTest {
                     System.out.println("Enum: " + c.flags().getValue("enum", FlagEnum.PROXI));
                 })
                 .build());
+
+        /* Build command for testing float */
+        manager.command(manager.commandBuilder("float")
+                .argument(FloatArgument.of("num"))
+                .handler(c -> {
+                    System.out.printf("%f\n", c.<Float>get("num"));
+                }));
     }
 
     @Test
@@ -238,6 +246,12 @@ class CommandTreeTest {
                 manager.command(manager.commandBuilder("two").argument(argument)));
     }
 
+    @Test
+    void testFloats() {
+        manager.executeCommand(new TestCommandSender(), "float 0.0").join();
+        manager.executeCommand(new TestCommandSender(), "float 100").join();
+    }
+
 
     public static final class SpecificCommandSender extends TestCommandSender {