v3.5 BETA - FIX