Fixed saving empty groups