Fix 6 + versioning