Fixing a FC007 problem