More fail-safe against extension