[FJJ] - Fix xfire issue