Fj performance fix