SerializableEMap re-fix :)