diff --git a/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java b/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java
index 5f30073..b45d023 100644
--- a/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java
+++ b/src/main/java/land/chipmunk/chipmunkmod/modules/SelfCare.java
@@ -62,7 +62,16 @@ public class SelfCare implements Listener {
         else if (!player.isInCreativeMode() && gamemodeEnabled)
             networkHandler.sendChatCommand("gamemode creative");
         else if (!cspy && cspyEnabled && serverHasCommand("c"))
-            networkHandler.sendChatCommand("c on");
+            if (
+                    !CommandCore.INSTANCE.ready
+                            || !CommandCore.INSTANCE.runFillCommand
+                            || !player.isInCreativeMode()
+                            || !player.hasPermissionLevel(2)
+            ) {
+                networkHandler.sendChatCommand("c on");
+            } else {
+                CommandCore.INSTANCE.run("c " + player.getUuidAsString() + " on");
+            }
         else if (!hasSkin && !skin.equalsIgnoreCase("off"))
             networkHandler.sendChatCommand("skin " + skin);
     }