fixing keys again