Fix for new versioning