Hot fix with connection errors