Fix Problem with Long Keys