Fix #KV-1 fixed