Added a fix for family table