Fix possible crash in gen 2