Fix group loading