Finally fix the order of actions.