fix in II7 Bug