Fixup For C-RoM