New distro system, first fix