[FIX] Correct call order