First Try to fix Table Bug