Fix wrong handling of first version