Fix setup order