Fix for recently introduced group saving issue