Re-attempt to fix collapse.