Fix order processing