Remote sorting fix