Ensure we pick up prior groups instances

Change-Id: I2878ca3473378f71cacb096026f16cd9ab26e0b4