--- a/src/parse.c
+++ b/src/parse.c
@@ -244,9 +244,10 @@
             case 18:           /* tell */
                 if ((token = strtok (NULL, " "))) {
                     if ((parameters = strtok (NULL, "\r\n"))) {
-                        snprintf (msg, 512, "PRIVMSG %s :%s, %s\r\n",
-                                  ('*' == *token) ? ++token : message->channel, token, db_lookup (DATABASE_FILE,
-                                                                                                  parameters));
+                        if (*token == '*')
+                            message->channel = ++token;
+                        snprintf (msg, 512, "PRIVMSG %s :%s, %s\r\n", message->channel, token,
+                                  db_lookup (DATABASE_FILE, parameters));
                     }
                 }
                 return msg;