Fix setup once again