changing flow to do not process the same order twice