fix group expansion