Feature fix ffm