Fix group api