diff --git a/src/commands.py b/src/commands.py
index 09fab2963..9fb65c203 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -400,7 +400,9 @@ def callerInGivenChannel(irc, msg, args, state):
         irc.errorInvalid('channel', args[0])
 
 def nickInChannel(irc, msg, args, state):
+    st = state.copy()
     inChannel(irc, msg, args, state)
+    state.args = st.args
     if args[0] not in irc.state.channels[state.channel].users:
         irc.error('%s is not in %s.' % (args[0], state.channel), Raise=True)
     state.args.append(args.pop(0))