version
NPE fix
eid fix
version