Fix for new table format