Fixing keys again