diff --git a/irc/connection.go b/irc/connection.go
index d6aaf16..0990b6f 100644
--- a/irc/connection.go
+++ b/irc/connection.go
@@ -193,7 +193,7 @@ func (conn *Conn) recv() {
 		if len(args) > 1 {
 			line.Text = args[1]
 		}
-		args = strings.Split(args[0], " ", 0)
+		args = strings.Split(args[0], " ", -1)
 		line.Cmd = strings.ToUpper(args[0])
 		if len(args) > 1 {
 			line.Args = args[1:len(args)]
diff --git a/irc/handlers.go b/irc/handlers.go
index c04fd6d..9800bb2 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -424,7 +424,7 @@ func (conn *Conn) setupEvents() {
 	// Handle 353 names reply
 	conn.AddHandler("353", func(conn *Conn, line *Line) {
 		if ch := conn.GetChannel(line.Args[2]); ch != nil {
-			nicks := strings.Split(line.Text, " ", 0)
+			nicks := strings.Split(line.Text, " ", -1)
 			for _, nick := range nicks {
 				// UnrealIRCd's coders are lazy and leave a trailing space
 				if nick == "" {