Fixed bug when running on multiple slaves