Tables: amend f799a29 with a better solution + fix potential overflow  (#6140)
3 files changed