QA fix for upgrade