Modify empty gropu behavior