diff --git a/scripts/commands/forcerun.py b/scripts/commands/forcerun.py
index c4dabf79..69a25ad8 100644
--- a/scripts/commands/forcerun.py
+++ b/scripts/commands/forcerun.py
@@ -4,6 +4,6 @@ def setup(core, actor, buff):
 	return
 	
 def run(core, actor, target, commandString):
-	core.buffService.addBuffToCreature(actor, 'fs_force_run', actor)
+	core.buffService.addBuffToCreature(target, 'fs_force_run', actor)
 	return
 	
\ No newline at end of file
diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java
index f30411d3..0e0e47db 100644
--- a/src/services/command/CommandService.java
+++ b/src/services/command/CommandService.java
@@ -164,6 +164,11 @@ public class CommandService implements INetworkDispatch  {
 						if (target == actor) {
 							target = null;
 						}
+						
+						// It's possible they use c cmdString to indicate if it should always be on self
+						if (name.contains("c")) {
+							//target = actor;
+						}
 					}
 					
 					break;