Fixed issue #2054
Distributed: fixed timeout problems