keyValue bug fix.