Patching to 3.0.58