YH-388: Improved virus checking