Fixed calculation of polarization