Issue #1549 changed table order