Add fix for handling never-used keys