Table groups fix