Attempt to fix the logic for group disable
Use system wins over the one offered by sb