initial fix for issue with infinite timeouts.