Experimental: Correct a possible race condition with Spigot.