#ifdefed DMF fix so not compiled by default. We need to look at this...