Fix for FC045