[ENH] UFEM: Better handling of RCG method