Fix the fix column issues