Group prefixing fix