Another attempt to fix versioning