Fixed k/v mixup bug?