Fix #1640 - Current ELF is passing all those orcs