[Fix] KVMessage - switch to if statement