Setup is broken, let's fix it (2nd attempt)