Fix for #310 Feat emptygroup