Fix bug introduced by last commit, no group_id