Gen 3: Fix residual order