Fix setup