Fix EB Error case