CMFM: Fix race condition

Change-Id: I3ed0d38665b12aa39313c55f7daaa63bd80875a0
Signed-off-by: jruesga <jorge@ruesga.com>