FFA Map troubles may be over soon