fix collapse nasty bug