Fix the fix in rev. 1.15 so that we jump to the next column instead of always skipping it.
Fix the fix in rev. 1.15 so that we jump to the next column
instead of always skipping it.

MFC after:	3 days

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase