fixup! 9c6f3a99f6da763ed9216d3d3307f71c0a84bf5c better table/column
checking