Fixed: #2455 Fixed FAI handling