fixed kv stuff