Another attempt on table fix.