better fix for upgrade forms script