Distributed: try to see if a merely wait fix this problem for now