Make IEs work

Change-Id: Id7e5b5e3a38152fe4e6928ddaa6b9e2cbd088b02