diff --git a/top.c b/top.c
index 5a997f26..4c27b16a 100644
--- a/top.c
+++ b/top.c
@@ -1617,9 +1617,9 @@ static void windows_stage1 (void)
       const int   sort;
       const int   clrs[4];      /* summ, msgs, heads, task */
    } wtab[] = {
-      { "Def", DEF_FIELDS, P_PID,
+      { "Def", DEF_FIELDS, P_CPU,
          { COLOR_RED, COLOR_RED, COLOR_YELLOW, COLOR_RED } },
-      { "Job", JOB_FIELDS, P_TM2,
+      { "Job", JOB_FIELDS, P_PID,
          { COLOR_CYAN, COLOR_CYAN, COLOR_WHITE, COLOR_CYAN } },
       { "Mem", MEM_FIELDS, P_MEM,
          { COLOR_MAGENTA, COLOR_MAGENTA, COLOR_BLUE, COLOR_MAGENTA } },
diff --git a/top.h b/top.h
index a85ec102..8a1e90cd 100644
--- a/top.h
+++ b/top.h
@@ -297,7 +297,7 @@ typedef struct win {
 
         /* These are the possible fscanf formats used in /proc/stat
            reads during history processing.
-           ( 5th number added in anticipation of kernel change ) */
+           ( 5th number only for Linux 2.5.41 and above ) */
 #define CPU_FMTS_JUST1  "cpu %Lu %Lu %Lu %Lu %Lu"
 #ifdef PRETEND4CPUS
 #define CPU_FMTS_MULTI CPU_FMTS_JUST1