Fixed FC019 and FC034