Virus Bug Fix!... More or less