Fix 'fa' and verify it with tests