Connection timeout fix