fix for table and grid