Fix version handling changes