Solve versioning issue