Fixed bugs with eid.
Fixed bugs.