Fixed EOA initialization