Fix for correct connection procedure