Adjusted to efa.core.Unerased