fix for occasional race conditions