Distributed: fixed issue with timeouts