Fix hook order