Elf loading fixed