Fix: works on new install process