fix FC017 and FC023