Fixing FC007