Patched up to 3.0.82