Fix genarated keys