Fix versions compatibility