Another attempt at fixing fast grouper