Fix fif order