Fix for FC007