fix collapse issue