Should fix groups "blanking" bug