See if this solves the problem: http://public.avast.com/~rypacek/patches/