diff --git a/client.go b/client.go
index f253280..6f67c09 100644
--- a/client.go
+++ b/client.go
@@ -101,7 +101,7 @@ func clientMsgGRolesAck(m *ChatWarsMessageGRolesAck) {
 }
 
 func clientGetCWUserID64(tgUserID64 int64) (int64, error) {
-	if clt, ok := getLockedClient(m.Msg.UserID64, false); ok {
+	if clt, ok := getLockedClient(tgUserID64, false); ok {
 		i := clt.CWUserID64
 		clt.Mux.Unlock()
 		return i, nil
diff --git a/utils.go b/utils.go
index 018c3b8..996399e 100644
--- a/utils.go
+++ b/utils.go
@@ -79,8 +79,8 @@ func toChatWarsDate(t time.Time) (s string, err error) {
 }
 
 func RndInt64() int64 {
-	RndMu.Lock()
+	RndMux.Lock()
 	i := RndSrc.Int63()
-	RndMu.Unlock()
+	RndMux.Unlock()
 	return i
 }
diff --git a/workers.go b/workers.go
index c4c4882..192310b 100644
--- a/workers.go
+++ b/workers.go
@@ -571,8 +571,8 @@ func MQTidyKeepAliveWorker() {
 		t := time.Now()
 		muxClients.Lock()
 		for id, clt := range clients {
-			if clt.Active && clt.Date.Add(3*KeepAliveHeartBeatSeconds*time.Second).Before(time.Now()) {
-				msgs, err := clt.MQ.Channel.QueuePurge(c.MQ.Queue.Name, false)
+			if clt.Active && clt.HeartBeat.Add(3*KeepAliveHeartBeatSeconds*time.Second).Before(time.Now()) {
+				msgs, err := clt.MQ.Channel.QueuePurge(clt.MQ.Queue.Name, false)
 				logOnError(err, "MQTidyKeepAliveWorker : Channel.QueuePurge()")
 				err = clt.MQ.Channel.Close()
 				logOnError(err, "MQTidyKeepAliveWorker : Channel.Close()")