Issue #1607: Tabulations fix