Fix 7 + versioning