Fixing CF template