fix the last tables