Fixed legacy groups behavior

Change-Id: I69e7230aaf11ac3a7fb61dde52577ab43cdc7cb9