Attempting to fix undetected timeouts