(v0.22.3.3) Fixed saving FA