Maybe another fix for keys