ACTUALLY fixed client timeouts