[BUG #8678] Fixed page reordering