Patch to 3.0.64 (Snuzzo)