BugFix in tabulation