Fix issue with missing keys