Fixing FC007 and FC045