Attempting to circumvent another race condition