Updated fpr compatibility 2.5