diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
index 8328f34ea8..5e79641b7d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/UtilityCommands.java
@@ -101,7 +101,6 @@ public int fill(Actor actor, LocalSession session, EditSession editSession,
         radius = Math.max(1, radius);
         we.checkMaxRadius(radius);
         depth = Math.max(1, depth);
-        we.checkMaxRadius(depth);
 
         BlockVector3 pos = session.getPlacementPosition(actor);
         int affected = editSession.fillXZ(pos, pattern, radius, depth, false);
@@ -124,8 +123,8 @@ public int fillr(Actor actor, LocalSession session, EditSession editSession,
                          Integer depth) throws WorldEditException {
         radius = Math.max(1, radius);
         we.checkMaxRadius(radius);
-        depth = depth == null ? (int) Math.round(radius) : Math.max(1, depth);
-        we.checkMaxRadius(depth);
+        depth = depth == null ? Integer.MAX_VALUE : Math.max(1, depth);
+        we.checkMaxRadius(radius);
 
         BlockVector3 pos = session.getPlacementPosition(actor);
         int affected = editSession.fillXZ(pos, pattern, radius, depth, true);