Fix 3.0.12 a bit