FM: Additional fixup

Change-Id: I21bbcb3fe82b3f99696ce329578ae3959db6a14e