Better timeout fix