(FBA 0.2.97.28) Fix same issue in FBA mainline