trying to fix collapse