Fixing bug with column mode, new mapping