Fix returning keys generated support