Last row fix on FA