Trying (again) to fix setup