Fix table issue