Fix list of groups