New fix + versioning