Fix issue on OrderAction