Fixed the 'large group size' bug