BRANCH 4.3: fixed last column issue