Fix computing of afc and fc columns