Fixed distributed mode issue