Fix issue of keys that doesn't follow expected interface.