Fix for couple of single group restoration