Fixed generated keys collection
Fixed generated keys collection