Fix for the nested tables