Fix issues with table building format wrong.