VIE Upgrade related bug fix