Added ensure check to aggressive upgrade