Added a workaround for addressing not persisting on IOMs