Sam process order saving fix