Edo's bug fixed