Group issue fix