Fixed monomer/bilayer g_energy conflict