Delay in distributed mode fix

Please review.