fixed fa issue