Before fixing Make.table