[Upg] collapse fix