fix CSFR issue