adjust for NullE