#386 Fixed setting eid