Fixing CF

Tetsuya's fix of CF values