6.520 FIX  V2!