Minor shuffle fix