Fix SWW when ordering