Fix issue with listing keys that are broken.