Fix 4.00 support