More fix. Group and Ungroup undo work.