BF Class fix