Fix 3.0 prevent issue