Moving keymaster call below the key creation