Make.table names bug fix 2