KV methods fixed