Fixing connection timeout