Dev 1610 - Fix Group weirdness