Elenchi FFAA fix #1066