Fixed FMP support