[TASK] Correct ownership of the key