Fix setup again