Cfm fix

Merged Philipp Arras requested to merge cfm_fix into NIFTy_7

Merge request reports