Fix Connect Issue - Race Condition