Fix order handler