Fix Problem With Long Keys