Fix calcul column + optimizations