Fix calc_F loop
Fixed conflict