Generated keys fixed