ZAP report thor slave log file not correct with virtual slaves (channels)

In ws_workunitsService.cpp I see this code, which will not work correctly with channels:

for (unsigned i = 0; i < numberOfSlaves; i++)
{
    VStringBuffer fileName("%s%c%s_thorslave.%d.%s.log", path, PATHSEPCHAR, processName.str(), i+1, logDate.str());
}

With channels you will see msgs like this -
00000014 2016-11-30 14:07:44.658 4012 4012 "Slave log 1 contains virtual slaves: 1,3,5,7"
This is when there are 2 slaves and 4 channels per slave.