Furhter fix in TableMapBuilder