Fix ELF regression issue