PM-581 : fix multiple orders