Fix 3.5 supports handling