fix FC issues...