No Message Returned for Virus Found

If both the Executable and the Daemon are enabled in the configuration a virus scan of an infected file returns no value from the antivirus_file_validation although it should because it does find a virus. This is, I believe, because it runs through the scan twice and ends up adding the $return variables together. I am getting a return code of 3 which I suspect is because the first scan finds the the virus (1) and removes the file and the second scan errors (2) because it can't find the file.

Effectively this is not working with multiple scans and I assume this would be true if there were multiple antivirus as well. if the first one finds the virus it should return at that point and only continue to a second scan if the first one fails to find anything, right?

Will create a fix if I can.