fix FC005 and FC007