Fix possible crash in gen 1