May have fixed the race condition ...