fixing FC007 and FC045.