fix make all order